Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rebase error #8165

Merged
merged 1 commit into from
Mar 6, 2021
Merged

Fix rebase error #8165

merged 1 commit into from
Mar 6, 2021

Conversation

yrliou
Copy link
Member

@yrliou yrliou commented Mar 6, 2021

Quick follow-up commit for fixing a rebase mistake.
Original issue: brave/brave-browser#14477

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@yrliou yrliou added this to the 1.23.x - Nightly milestone Mar 6, 2021
@yrliou yrliou requested a review from bbondy March 6, 2021 03:50
@yrliou yrliou self-assigned this Mar 6, 2021
@bbondy bbondy merged commit cf1f1dd into master Mar 6, 2021
@bbondy bbondy deleted the fix_build branch March 6, 2021 03:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants